MessageTray: use boxpointer for summary notification

https://bugzilla.gnome.org/show_bug.cgi?id=624900

diff --git a/data/theme/gnome-shell.css b/data/theme/gnome-shell.css
index c14709c6ad2b7805ff82b4ecfe9b0483c8863d65..9cd879c6e44ab4fbe8d7fd8917f7cc20ca10a413 100644 (file)
--- a/data/theme/gnome-shell.css
+++ b/data/theme/gnome-shell.css
@@ -863,9 +863,19 @@ StTooltip {
     padding-bottom: 8px;
 }
 
-#summary-notification-bin #notification {
-    /* message-tray.height + notification.padding-bottom */
-    padding-bottom: 44px;
+.summary-notification-boxpointer {
+    -arrow-border-radius: 9px;
+    -arrow-background-color: rgba(0,0,0,0.9);
+    -arrow-border-width: 2px;
+    -arrow-border-color: #5f5f5f;
+    -arrow-base: 30px;
+    -arrow-rise: 15px;
+}
+
+.summary-notification-boxpointer #notification {
+    border-radius: 9px;
+    background: rgba(0,0,0,0) !important;
+    padding-bottom: 12px;
 }
 
 #notification-scrollview {

diff --git a/js/ui/messageTray.js b/js/ui/messageTray.js
index a028d32061032f93dab13df6d3676fe2092a84ab..95183c6a1375ae2febef158d518be4ec462b6260 100644 (file)
--- a/js/ui/messageTray.js
+++ b/js/ui/messageTray.js
@@ -12,6 +12,7 @@ const St = imports.gi.St;
 const Tweener = imports.ui.tweener;
 
 const Main = imports.ui.main;
+const BoxPointer = imports.ui.boxpointer;
 const Params = imports.misc.params;
 
 const ANIMATION_TIME = 0.2;
@@ -778,15 +779,19 @@ MessageTray.prototype = {
         this._summaryBin.child = this._summary;
         this._summaryBin.opacity = 0;
 
-        this._summaryNotificationBin = new St.Bin({ name: 'summary-notification-bin',
-                                                    anchor_gravity: Clutter.Gravity.NORTH_EAST,
-                                                    reactive: true,
-                                                    track_hover: true });
-        this.actor.add_actor(this._summaryNotificationBin);
-        this._summaryNotificationBin.lower_bottom();
-        this._summaryNotificationBin.hide();
+        this._summaryMotionId = 0;
+
+        this._summaryNotificationBoxPointer = new BoxPointer.BoxPointer(St.Side.BOTTOM,
+                                                                        { reactive: true,
+                                                                          track_hover: true });
+        this._summaryNotificationBoxPointer.actor.style_class = 'summary-notification-boxpointer';
+        this.actor.add_actor(this._summaryNotificationBoxPointer.actor);
+        this._summaryNotificationBoxPointer.actor.lower_bottom();
+        this._summaryNotificationBoxPointer.actor.hide();
+
         this._summaryNotification = null;
         this._clickedSummaryItem = null;
+        this._clickedSummaryItemAllocationChangedId = 0;
         this._expandedSummaryItem = null;
         this._summaryItemTitleWidth = 0;
 
@@ -817,7 +822,7 @@ MessageTray.prototype = {
         Main.chrome.addActor(this.actor, { affectsStruts: false,
                                            visibleInOverview: true });
         Main.chrome.trackActor(this._notificationBin);
-        Main.chrome.trackActor(this._summaryNotificationBin);
+        Main.chrome.trackActor(this._summaryNotificationBoxPointer.actor);
 
         global.gdk_screen.connect('monitors-changed', Lang.bind(this, this._setSizePosition));
 
@@ -859,7 +864,6 @@ MessageTray.prototype = {
 
         // These work because of their anchor_gravity
         this._summaryBin.x = primary.width;
-        this._summaryNotificationBin.x = primary.width;
     },
 
     contains: function(source) {
@@ -964,7 +968,7 @@ MessageTray.prototype = {
             needUpdate = true;
         }
         if (this._clickedSummaryItem && this._clickedSummaryItem.source == source) {
-            this._clickedSummaryItem = null;
+            this._unsetClickedSummaryItem();
             needUpdate = true;
         }
 
@@ -993,7 +997,7 @@ MessageTray.prototype = {
         if (!this._locked)
             return;
         this._locked = false;
-        this._clickedSummaryItem = null;
+        this._unsetClickedSummaryItem();
         this._updateState();
     },
 
@@ -1116,7 +1120,7 @@ MessageTray.prototype = {
         if (!this._clickedSummaryItem || this._clickedSummaryItem != summaryItem)
             this._clickedSummaryItem = summaryItem;
         else
-            this._clickedSummaryItem = null;
+            this._unsetClickedSummaryItem();
 
         this._updateState();
     },
@@ -1478,25 +1482,51 @@ MessageTray.prototype = {
         if (index != -1)
             this._notificationQueue.splice(index, 1);
 
-        this._summaryNotificationBin.child = this._summaryNotification.actor;
+        this._summaryNotificationBoxPointer.bin.child = this._summaryNotification.actor;
         this._summaryNotification.grabFocus(true);
 
-        this._summaryNotificationBin.opacity = 0;
-        this._summaryNotificationBin.y = this.actor.height;
-        this._summaryNotificationBin.show();
-
         if (!this._summaryNotificationExpandedId)
             this._summaryNotificationExpandedId = this._summaryNotification.connect('expanded', Lang.bind(this, this._onSummaryNotificationExpanded));
         this._summaryNotification.expand(false);
+
+        this._clickedSummaryItemAllocationChangedId =
+            this._clickedSummaryItem.actor.connect('allocation-changed',
+                                                   Lang.bind(this, this._adjustNotificationBoxPointerPosition));
+        // _clickedSummaryItem.actor can change absolute postiion without changing allocation
+        this._summaryMotionId = this._summary.connect('allocation-changed',
+                                                      Lang.bind(this, this._adjustNotificationBoxPointerPosition));
+
+        this._summaryNotificationBoxPointer.actor.opacity = 0;
+        this._summaryNotificationBoxPointer.actor.show();
+        this._adjustNotificationBoxPointerPosition();
+
+        this._summaryNotificationState = State.SHOWNING;
+        this._summaryNotificationBoxPointer.animateAppear(Lang.bind(this, function() {
+            this._summaryNotificationState = State.SHOWN;
+        }));
+    },
+
+    _adjustNotificationBoxPointerPosition: function() {
+        // The position of the arrow origin should be the same as center of this._clickedSummaryItem.actor
+        if (!this._clickedSummaryItem)
+            return;
+
+        this._summaryNotificationBoxPointer.setPosition(this._clickedSummaryItem.actor, 0, St.Align.MIDDLE);
+    },
+
+    _unsetClickedSummaryItem: function() {
+        if (this._clickedSummaryItemAllocationChangedId) {
+            this._clickedSummaryItem.actor.disconnect(this._clickedSummaryItemAllocationChangedId);
+            this._summary.disconnect(this._summaryMotionId);
+            this._clickedSummaryItemAllocationChangedId = 0;
+            this._summaryMotionId = 0;
+        }
+
+        this._clickedSummaryItem = null;
     },
 
     _onSummaryNotificationExpanded: function() {
-        this._tween(this._summaryNotificationBin, '_summaryNotificationState', State.SHOWN,
-                    { y: this.actor.height - this._summaryNotificationBin.height,
-                      opacity: 255,
-                      time: ANIMATION_TIME,
-                      transition: 'easeOutQuad'
-                    });
+        this._adjustNotificationBoxPointerPosition();
     },
 
     _hideSummaryNotification: function() {
@@ -1504,25 +1534,18 @@ MessageTray.prototype = {
             this._summaryNotification.disconnect(this._summaryNotificationExpandedId);
             this._summaryNotificationExpandedId = 0;
         }
-
         // Unset this._clickedSummaryItem if we are no longer showing the summary
         if (this._summaryState != State.SHOWN)
-            this._clickedSummaryItem = null;
-        this._summaryNotification.ungrabFocus();
+            this._unsetClickedSummaryItem();
 
-        this._tween(this._summaryNotificationBin, '_summaryNotificationState', State.HIDDEN,
-                    { y: this.actor.height,
-                      opacity: 0,
-                      time: ANIMATION_TIME,
-                      transition: 'easeOutQuad',
-                      onComplete: this._hideSummaryNotificationCompleted,
-                      onCompleteScope: this
-                    });
+        this._summaryNotification.ungrabFocus();
+        this._summaryNotificationState = State.HIDING;
+        this._summaryNotificationBoxPointer.animateDisappear(Lang.bind(this, this._hideSummaryNotificationCompleted));
     },
 
     _hideSummaryNotificationCompleted: function() {
-        this._summaryNotificationBin.hide();
-        this._summaryNotificationBin.child = null;
+        this._summaryNotificationState = State.HIDDEN;
+        this._summaryNotificationBoxPointer.bin.child = null;
         this._summaryNotification.collapseCompleted();
         let summaryNotification = this._summaryNotification;
         this._summaryNotification = null;